From 6556787e0af62b2edf8b28f448da6c4802585e33 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 10 Nov 2005 17:42:48 +0000 Subject: [PATCH] Remove an erroneous semicolon. 2005-11-10 Matthias Clasen * gdk/x11/gdkcolor-x11.c (gdkx_colormap_get): Remove an erroneous semicolon. --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ gdk/x11/gdkcolor-x11.c | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cb08c032a8..2047f15db6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-11-10 Matthias Clasen + * gdk/x11/gdkcolor-x11.c (gdkx_colormap_get): Remove an erroneous + semicolon. + Don't corrupt odd keymaps (#316638, Kean Johnston) * gdk/x11/gdkkeys-x11.c (set_symbol): Auxiliary function to diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index cb08c032a8..2047f15db6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-11-10 Matthias Clasen + * gdk/x11/gdkcolor-x11.c (gdkx_colormap_get): Remove an erroneous + semicolon. + Don't corrupt odd keymaps (#316638, Kean Johnston) * gdk/x11/gdkkeys-x11.c (set_symbol): Auxiliary function to diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c index 35dcb6fdf8..4e12a7d958 100644 --- a/gdk/x11/gdkcolor-x11.c +++ b/gdk/x11/gdkcolor-x11.c @@ -1371,7 +1371,7 @@ gdkx_colormap_get (Colormap xcolormap) GdkColormap *colormap; if (xcolormap == DefaultColormap (GDK_SCREEN_XDISPLAY (screen), - GDK_SCREEN_XNUMBER (screen))); + GDK_SCREEN_XNUMBER (screen))) return g_object_ref (gdk_screen_get_system_colormap (screen)); colormap = gdk_colormap_lookup (screen, xcolormap); -- 2.30.2